Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Mirror: Cleaner Grenade #385

Merged
merged 2 commits into from
May 10, 2024
Merged

Mirror: Cleaner Grenade #385

merged 2 commits into from
May 10, 2024

Conversation

SimpleStation14
Copy link
Member

Mirror of PR #25444: Cleaner Grenade from space-wizards space-wizards/space-station-14

55ad9c7e433ebd0f58229157d2d7fd766b268ee4

PR opened by DenisShvalov at 2024-02-21 14:47:43 UTC

PR changed 9 files with 63 additions and 3 deletions.

The PR had the following labels:

  • No C#
  • Changes: Sprites
  • Status: Needs Review

Original Body

Added Cleaner Grenade

About the PR

Added Cleaner Grenades that creates foam of space cleaner of activate

  • Added 2 grenades in janitor belt on spawn
  • Added 2 grenades in custodial closet
  • Added 2 grenades in janitorial supplies crate

Why / Balance

Big puddles of space lube 💀

Media

Desktop.2024.02.22.-.00.37.49.03.DVR_Trim_Trim.mp4
  • I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

🆑

  • add: Added Cleaner Grenades that will help janitors in their work

@SimpleStation14 SimpleStation14 added the Pull Request Mirror Mirrors a PR from another Repo. Automatically applied by mirror bot label May 3, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented May 3, 2024 •
edited
Loading

RSI Diff Bot; head commit d37a86f merging into b68ed3c
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Objects/Weapons/Grenades/janitor.rsi

State Old New Status
equipped-BELT Added
icon Added
primed Added

Edit: diff updated after d37a86f

@VMSolidus VMSolidus marked this pull request as ready for review May 6, 2024 18:41
VMSolidus
VMSolidus approved these changes May 6, 2024
View reviewed changes
Copy link
Member

@VMSolidus VMSolidus left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This one's good, I'll set it to automerge for when another maintainer checks it because this is needed for the DV update queue.

@VMSolidus VMSolidus enabled auto-merge (squash) May 6, 2024 19:00
FoxxoTrystan
FoxxoTrystan reviewed May 10, 2024
View reviewed changes
Copy link
Member

@FoxxoTrystan FoxxoTrystan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Aproved.

Grenade works, belt works, box are here, ect...
All seem good from my side.

image

@github-actions github-actions bot added Changes: Sprite Changes any png or json in an RSI Changes: YML Changes any yml files labels May 10, 2024
DangerRevolution
DangerRevolution approved these changes May 10, 2024
View reviewed changes
Copy link
Contributor

@DangerRevolution DangerRevolution left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed, nice PR

@VMSolidus VMSolidus merged commit 44378ac into Simple-Station:master May 10, 2024
11 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@FoxxoTrystan FoxxoTrystan FoxxoTrystan left review comments

@DangerRevolution DangerRevolution DangerRevolution approved these changes

@VMSolidus VMSolidus VMSolidus approved these changes

Assignees
No one assigned
Labels
Changes: Sprite Changes any png or json in an RSI Changes: YML Changes any yml files Pull Request Mirror Mirrors a PR from another Repo. Automatically applied by mirror bot
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@SimpleStation14 @VMSolidus @FoxxoTrystan @DangerRevolution